Auto merge of #1405 - alexcrichton:issue-1401, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 26 Mar 2015 21:42:57 +0000 (21:42 +0000)
committerbors <bors@rust-lang.org>
Thu, 26 Mar 2015 21:42:57 +0000 (21:42 +0000)
This should inadvertently fix #1401


Trivial merge